Merge "Lift atrace restriction of 16 traced apps" am: 79aa906eb6 am: 0ab150caa9
am: f6b8ccff82

Change-Id: I0fc956b4fded2e99e6aebd17730c2c3fd4f74750