Merge "AHB: add camera usage bits to vndk" am: 9f0e60e62f

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

Change-Id: I8b2c0244fb5b8943a051c4b51d9bc124afd68082