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