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