Merge "Enable FSI_ON_DND_UPDATE for dogfood" into tm-qpr-dev am: f29b060a...

Merge "Enable FSI_ON_DND_UPDATE for dogfood" into tm-qpr-dev am: f29b060a am: 9f011327 am: 3a13b32c

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



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