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