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



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