Merge "Fixed testDisplayMetricsPinUnpin" into stage-aosp-oc-cts-dev