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

Change-Id: I3dbad676d96da667fb7b78a0dd9ee21a0a26a4e4