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