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