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