[automerger skipped] Merge "Make LinkPropertiesTest compatible with Q" into...
[automerger skipped] Merge "Make LinkPropertiesTest compatible with Q" into rvc-dev am: fef4e249 am: 2b40a3b5 -s ours
am skip reason: Change-Id I38b0d83abf983b3bcc01fc6aea2e5cc307734198 with SHA-1 51a3c07f is in history
Change-Id: I4a36bd6fe06407f343fa6a518367c3b9630cbec9