Merge "Check if DSU is in use before feature flag am: 7687aaac1d am: 90fed5d215" into qt-r1-dev-plus-aosp
am: 322a5e11a0

Change-Id: I2d9c8abf2d7b700471167b6ef2b35b3b5d1e6f02