Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17821975 Change-Id: I9f1825b87a3e27fc66884a69021d55ab69a6c7ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>