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

Change-Id: I32de6e3db5434075f44119b18203dd4a8fdbc92b