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