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