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



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