Merge "Clean the sample wifi aware" am: 337d67d20c am: 457a1c02de am: 235b0447d2 am: 9dc7dfa68b

Original change: https://android-review.googlesource.com/c/platform/cts/+/1941513

Change-Id: I07bd6795a1960896604e8bb2e7f6624995cde658