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

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