Merge "Remove device_admin feature from wearables." into pi-dev
am: ac8342d48f

Change-Id: I14a7adfb65a0020d985bb9375d97ed2ca655e0b7