[automerger skipped] Merge "Update OWNERS for database code" am: aea74ff62a am: 92732c2a25
am: 49a46611ef  -s ours

Change-Id: I11536a84c71dc45f91ad0e9e14668d91d161e3d2