Merge "AHB: add camera usage bits to vndk" am: 9f0e60e62f am: 19d14c56b3 am: 45317f5c7c am: f04bef4c21

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1740715

Change-Id: I7640721d75702cadf6121a65e36a18f5571de3c6