Merge "Merge "Merge "Remove Btn D (Voice Assist) test as it is no longer available to apps." into oreo-cts-dev am: afbb182a8b  -s ours" into oreo-mr1-cts-dev am: 9733b6dfa9  -s ours"