Merge "Merge "Persist metric activation across beta4/5 ota" into qt-dev am: 12ae95987b am: 52cfa0e455" into qt-r1-dev-plus-aosp