[automerger skipped] Implement Get/Set UCE property from subinfo database am: 6e3543b218 am: 8f1bff5d45 am: 025c7a5367 -s ours
am skip reason: Change-Id I7ef13240241b8369b1d2642c30f7128994f680d8 with SHA-1 b7a866a606 is in history

Change-Id: Id2c52144187b6e564c3b36637a8d35c0e8d8f259