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