Merge "Merge changes from topic "dynamic_privacy_fixes" into qt-r1-dev am: ac7423b6b6 am: 5fad11273a" into qt-qpr1-dev-plus-aosp