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



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