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