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