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