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