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