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