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