Merge "Send network & security logging callbacks in foreground" into sc-dev am: 68aa35b0 am: a02f71dd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14530944

Change-Id: I8faf07dddeb19621a37cfbd42a94e44f9335146f