Merge "Merge "Revert create/update/delete database for apps that bypass restrictions." into rvc-dev am: db73a986dd am: b84c240ce0 am: 46662f2aef" into rvc-qpr-dev-plus-aosp am: 58a2edb6b5

Change-Id: Ic5a62367a45a9436b61fcbb58de3f7f9d121c7fb