DO NOT MERGE am: 7f8c5e6371
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183362 Change-Id: I1a6c4b606206abba9f1d06802a25b95d1a0f643b
This commit is contained in: