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