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