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