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