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

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



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