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