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