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

Change-Id: I4310b38631484ce7d1ddcf86c750eb67e6e41237