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