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