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

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



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