Merge "Fixed PredictionAppTracker as service might not be available on device." into qt-qpr1-dev am: 2083fd9b9f
am: d5cbf88f4b

Change-Id: I8d9243f541d1fbb5cadffb1d7103d608d2638a07