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