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