[automerger skipped] Merge "[1/n] Creates OptPropFactory to simplify OptIn and...

[automerger skipped] Merge "[1/n] Creates OptPropFactory to simplify OptIn and OptOut properties" into 24D1-dev am: 91c3f2d8 -s ours

am skip reason: Merged-In Id9d0e8892daa7dc8129eaee44d59e74de045ea3c with SHA-1 6d3104d8 is already in history

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



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