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