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