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

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

Change-Id: I86bb90f28afb7274d4c8f80ea844471bacbf18bd