Merge "[NS04] Introduce Network Offers and their callbacks" am: d603e40fa5 am: 06e72bc268

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

Change-Id: Ifc7c32e77a4aa7c183b0d074a8d04fe95a54d288