Snap for 6069976 from cf81dbcbe722bdafe459af1d0e76b9562fe2c719 to rvc-release

Change-Id: I7211e5ca88699acb3a6c775bea9f748ad38697ef
tree: 4f7b0e79825e6ddbdc4d0f659bf6158b1852416f
  1. apex/
  2. Android.bp