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



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