Merge "Don't forward touches to udfps if notification panel is expanding" into sc-dev am: f7b36eedf5 am: db88fa5c71

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

Change-Id: I10bb5475caad73feadcca07abb47209b79a60570