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