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

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

Change-Id: Ifb63b1459066b661c0736a8ff6dc87c435ca2be0