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

Change-Id: If120a6869ed712e231c2cbf844aed5269ed08099