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