[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am:...

[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: 68ca4e10 am: ee0cc87d -s ours

am skip reason: Change-Id I3a9ae6e17e49c731e825ef00b9b9574c3f2e2719 with SHA-1 b3288fbd is in history

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

Change-Id: I872eca85c4ce9b96b86ba8de67fbe603274ce0b3