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



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