Merge "Change disallow ambient display test instruction." into stage-aosp-pi-cts-dev