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