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