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



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