bring database code in master for 'adb bugreport' in sync with ginger

Change-Id: Ibe9eb07db363b483a07645e9644d75db51132808
1 file changed