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