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