Merge "Merge "Add a factoryReset method to IIpMemoryStore, and freeze api." am: 51164c16 am: 43089979 am: 10ddc681" into qt-r1-dev-plus-aosp