Merge "Update the test as NFC beam setting is moved in O" into oreo-cts-dev