Merge changes from topic 'am-53ce40f4d4244f45b19662f27574d289'

* changes:
  Merge changes from topic 'framework-net-aosp' am: b92aa5bd am: 0a7f2d07 am: 9aa93df2 am: 256d5cd6
  DO NOT MERGE: [CS] Remove timeout event after first available am: bf3b1bad  -s ours am: a8b73b23  -s ours am: ce10ba98 am: 4e7b5c25  -s ours
  DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest am: 5d265412  -s ours am: 2a2e22ab  -s ours am: a053ead6 am: 8cc63f25  -s ours
  DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest. am: 5bce5a16  -s ours am: efd928fe  -s ours am: 5cf18abc am: fb636d1f  -s ours
  DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net. am: 7ceef950  -s ours am: d1e22a3f  -s ours am: 4c4a86fd am: 3cf39b01  -s ours
  DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils. am: 3c295b59  -s ours am: bcb7e329  -s ours am: eb7b7664 am: 77852d0a  -s ours
  DO NOT MERGE: Move FakeSettingsProvider to a common location. am: b8df76e4  -s ours am: a84ede29  -s ours am: 33b238bd am: 0c34c325  -s ours
  DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such am: 5d540d14  -s ours am: e47b0886  -s ours am: 412e89fe am: 80587a02  -s ours
  DO NOT MERGE: Add option to skip and avoid captive portals. am: 1f64f3fd  -s ours am: 8006bd5c  -s ours am: 573880a1 am: c39a37c0  -s ours
  DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime am: dafc44ea  -s ours am: d063978a  -s ours am: 9c376346 am: 52587963  -s ours
  DO NOT MERGE: Do not synchronize boolean reads/writes am: 94dcb3c3  -s ours am: eb98bc95  -s ours am: a63d5e5f am: 9a686a26  -s ours
  DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters am: 4104ff92  -s ours am: 28899685  -s ours am: 02f16504 am: eaf63414  -s ours
  DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing am: 0668a61d  -s ours am: 976ef753  -s ours am: 046c5a31 am: 796a0bab  -s ours
  DO NOT MERGE: Support timeouts for requestNetwork() invocations. am: 3841a48d  -s ours am: eb6be2c8  -s ours am: e8dda0f7 am: cea7843c  -s ours
  DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network. am: accd5fcb  -s ours am: 8a73b289  -s ours am: a8500b7e am: 59d46341  -s ours