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