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