Merge "Add profile and level keys to MetaDatabase" am: 44f1d2a4 am:...

Merge "Add profile and level keys to MetaDatabase" am: 44f1d2a4 am: bcc3d2d1 am: dea35b79 am: fa98e2e3 am: ab720d9d

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2460209



Change-Id: Idd934ffbc4a40592d3c011b3d0e708845ef6df47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>