Merge "remove obsolete apf properties from platform" am: 6c88b0d1 am: 26fd2a83

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



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