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