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