[automerger skipped] Handle the case when non-optional props have the same...

[automerger skipped] Handle the case when non-optional props have the same value am: 5df5873d am: cde65cd9 am: 8e021bf4 -s ours

am skip reason: Change-Id Iba9b61d9779d93e86d9bead2286f945f8d51ab1d with SHA-1 9a326367 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12042312

Change-Id: I54f2edc189ee275fde5acf7b3d6c16d2f0adb6fd