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