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

Change-Id: Iead9c41067c298a65f86f3bbcf87b6adbfe95173