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