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