[automerger skipped] OMS: Add config_signature policy handling am: 0f942f99ca am: 98f8388042 am: 1dd9fa3689 am: 5b23d15d37 -s ours

am skip reason: Change-Id I645ee72271496008742886274be0d63a2985201b with SHA-1 9336d9e13b is in history

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

Change-Id: I505f3f6eadd824c87b0a4339d4c9556fd3e20aa6