Merge "Check if DSU is in use before feature flag am: 7687aaac1d am: bba71b8a0b" into qt-r1-dev-plus-aosp
am: 0204ce47be

Change-Id: If61475533ba57f29b1507836a6a8761c8ba6c217