Merge "[MS41.2] Add unit test for query history APIs" am: 606fb4f79f am: 4588b2a599

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

Change-Id: Ic6c7bcf6c00f06cab7c30f46154ee56fd34c4105