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

* changes:
  Merge "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6." into rvc-dev am: 00c2e16b28 am: ceabe2e3d0 am: d2b90633d3
  Merge "Relax locking for startActivityInPackage()." into rvc-dev am: 3c76edd5a3 am: 388ec641e4 am: baabf7a464