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