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