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