Merge "Fixes AssistOrbController crash" into sc-qpr1-dev am: c5f6c53cd8 am: 6c07d02298
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15526390 Change-Id: Icf019f5da696d2521f1ee4d5593b5bb43d02dee0
This commit is contained in: