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