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