Merge "Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43 am: ac7a897a am: fa99bb4b" into rvc-qpr-dev-plus-aosp