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