Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17884326 Change-Id: Ic4b8d39a03ce82dc2788436dd06ab28ceebb1fcf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>