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