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



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