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