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