Merge changes from topics "avf-sys-feature", "move-avf-jar-to-bcp" am: 757c168f12 am: 5639ef4953 am: 9d5013bdcd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2259705

Change-Id: Ia179f1943f42c869421a411c328d5689ad4fd341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>