Merge "Revert create/update/delete database for apps that bypass restrictions." into rvc-dev am: db73a986dd am: b84c240ce0 am: b4f06b9f8e am: b0cb7bfe85

Change-Id: I6bc5afd43a5ee942c999ba9f66cc5ba3b5f8606b