[automerger skipped] Merge "Change database package name align with the...
[automerger skipped] Merge "Change database package name align with the directory name" am: c684b7d3 am: 666ea130
am: 3eb921bb -s ours
am skip reason: change_id I2b6b1ce1b67eebe289fa3c8153fd296b1ee8cf19 with SHA1 799af024 is in history
Change-Id: I4171f7a73bb1d1bda1b8a88efd6f471edd0cc480