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