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