Merge "Merge "Fix deadlock in NetworkLoggingHandler" into oc-dev am: ba18b0c6 am: 9f840933" into oc-dr1-dev-plus-aosp