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