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