Merge "Android S: deprecate android.hardware.vr." am: 55ac62f92d am: 11b20638d1

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1540546

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id853123e698f78c801ea69d6fc700880797b7e09