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