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