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