Merge "Merge changes from topic "dynamic_privacy_fixes" into qt-r1-dev am: ac7423b6 am: 03974650" into qt-qpr1-dev-plus-aosp