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

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



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