Merge changes from topic "am-72ba767aee1d4586aa1d4b234c285269" into rvc-qpr-dev-plus-aosp

* changes:
  Merge "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6." into rvc-dev am: 00c2e16b28 am: 5ccff32cdf am: 1217f5bd2b
  Merge "Relax locking for startActivityInPackage()." into rvc-dev am: 3c76edd5a3 am: 984ce387ce am: ec20fa3c39