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