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: I6ef265c5f23be31ce0a191edea9998abaa9c6182