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