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