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