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