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