Revert "Resolve the conflict with aosp/1878149"

This reverts commit 44a766a78bd806dc321bbf454a7a50b8b46c650b.

Reason for revert: <due to impact on current running test cases>

Change-Id: I7202ba4db7c80259de3c07dd78046847062e5d28
1 file changed
tree: d757bdeeab9f8870143d8f9d556d27f4f9dec525
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. OWNERS
  7. PREUPLOAD.cfg