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