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