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