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

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

Change-Id: Idcdc31031d31bdbeef67a88fa4c133047e7cd39e