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