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