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