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