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



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