Merge changes from topic "am-2fe8edddf77a4f32803433e98b5995df" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Make log reader thread a class member" into rvc-dev am: 7aec1d83 am: 4a0dc5a1 -s ours am: 508bbf10 -s ours am: 547b64e1 -s ours am: 67401687 -s ours am: 367219bb -s ours am: d33640d5 -s ours am: 89e27b18 -s ours am: 4117b58f -s ours
  [automerger skipped] RESTRICT AUTOMERGE Make log reader thread a class member am: 03de4e4f am: 3cc45016 -s ours am: 9bee032a -s ours am: e7bd1c64 -s ours am: ed8fc43b -s ours am: 10961a4a -s ours am: 67fc90bf -s ours am: ca3813ab -s ours am: 2e28f135 -s ours