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

Change-Id: I0791eef6d1d10ed8b2779591c4ad75c38b7f84b3