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