Merge "Improve docs for generated properties in PropertyMapper" am: 46a915f6...

Merge "Improve docs for generated properties in PropertyMapper" am: 46a915f6 am: ef33f360 am: 58b0f9d6

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



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