Merge "Removing unused method isAvd" into ub-launcher3-qt-qpr1-dev am: 1a706cd538
am: 0b72d6a891

Change-Id: I830b5d86342c85b7f4d39ac72022b25cc6f0b766