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