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