Merge "RESTRICT AUTOMERGE Make log reader thread a class member" into rvc-dev am: 7aec1d83

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24181420



Change-Id: I735a9a8e78001e5acbe70134887a5416e54704e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>