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