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



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