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