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