tree 6a3e498bd58096602806ee53ba9591bd05021e41
parent c8cf2a5caef64e01b9fbf6533ccf7996c8e426c5
parent fa3cbe39cf798e3f64d9ce2b8bdf15bb1d82a9d0
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593021514 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1593021514 +0000

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