Merge "Retire the emulator workaround" am: 3d0c4367eb

Original change: https://android-review.googlesource.com/c/platform/system/logging/+/1544969

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie50e66fd71af3a625e9af302fdac9a4e9f8a4046
tree: 529fd22ec737e03fdd5c72280314192712444d7d
  1. liblog/
  2. logcat/
  3. logd/
  4. logwrapper/
  5. OWNERS
  6. PREUPLOAD.cfg
  7. TEST_MAPPING