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