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

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

Change-Id: I7a41d8dd0bcba3a6b37ef8d6e02660ffbac3130f