[automerger skipped] Merge "[DO NOT MERGE] Check property name before apply high refresh rate black list am: 0113bc0c95 am: c5a8ec6221" into qt-qpr1-dev-plus-aosp
am: 6133f191bd -s ours
am skip reason: subject contains skip directive

Change-Id: I9e0a52456fdb11f3fdf4be2deb7306d849eace00