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