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