Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  Make log reader thread a class member

Change-Id: Ibef975b420ce9dec411870c5378d689efd00f9a7