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