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