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

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



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