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

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

Change-Id: I7f057fa2f2f5c203f7ee474a9d44cb662cb377d6