Merge "Revert create/update/delete database for apps that bypass restrictions." into rvc-dev am: db73a986dd am: 9b08a9589b am: 976e641d4e

Change-Id: Ib7d3a32c697866d5fa4cee80a1fa0c7e9e846e7a