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

Change-Id: I8d989540dd6807c539026e8c912c581de82b324c