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

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

Change-Id: I31e3a92a8d565e6946bc059f1351767db7152f88