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