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

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

Change-Id: Iadd85718e719b09eb08d030d2dc1bae9c42c9e2c