Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23662639



Change-Id: Ie972e59c8d07fe9f3bcb7e89c1b7fae9305329e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>