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