[automerger skipped] [1/n] Creates OptPropFactory to simplify OptIn and OptOut properties am: b5037775c1 -s ours

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

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

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