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

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

Change-Id: Ic25be733c673e36d5086d82563abfb0349556b51