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