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