Merge changes from topics "avf-sys-feature", "move-avf-jar-to-bcp" am: 757c168f

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



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