Merge changes from topics "ms56-historybuilder", "ms65.3" am: 4794105511 am: 5877663151 am: cdfb046f61 am: bf9ec56aa3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951102

Change-Id: Id248fda5acdc9a457ed938ba4d06bc7f11b02637