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

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

Change-Id: I25a408b7d7798e42dff7752329a819f3a22fd9ce