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