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

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

Change-Id: If5520b66a5c32fcce6421815f5ba3f43d3fff70c