Merge "Fix NPE when calling dispatchTouchEvent in FloatingToolbarRoot" into tm-dev am: 6bc26a0374 am: 9bdc9aa999
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16977563 Change-Id: Ia3a25e750d3caf3e0cd3b285911047d5cc46cb8e
This commit is contained in: