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

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



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