[automerger skipped] Merge "[DO NOT MERGE] Check property name before apply...
[automerger skipped] Merge "[DO NOT MERGE] Check property name before apply high refresh rate black list" into qt-r1-dev am: fca755bd am: 1c03d902
am: fcf255fd -s ours
am skip reason: subject contains skip directive
Change-Id: Iac8b14bd3cd96f95e167c00572bd3903ef931487