[automerger skipped] Merge "Make LinkPropertiesTest compatible with Q" into rvc-dev am: d8223ef5fc am: 03d15b5453 -s ours
am skip reason: Change-Id I38b0d83abf983b3bcc01fc6aea2e5cc307734198 with SHA-1 ccd5ba288a is in history
Change-Id: I4a36bd6fe06407f343fa6a518367c3b9630cbec9
This commit is contained in: