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