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

Change-Id: I900b07e36599a27f194919a8109f2181586c1419