Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2760588



Change-Id: I39e1404a66848a0258010660759e471cae95ec13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>