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