Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2796602



Change-Id: I19cbdc698e97f12c09656039300c608f4c99228d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>