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