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