[automerger skipped] Merge "Make LinkPropertiesTest compatible with Q" into...
[automerger skipped] Merge "Make LinkPropertiesTest compatible with Q" into rvc-dev am: fef4e249 -s ours am: 702543bc -s ours
am skip reason: Change-Id I38b0d83abf983b3bcc01fc6aea2e5cc307734198 with SHA-1 f6139ce1 is in history
Change-Id: Ieef14cead5cecaa554553fda864c4275a85a3edb