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

Change-Id: I8a7c03658396ae0b6b9adb20418224454b9b4580