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

Change-Id: Ib58a568b0eca9278a08cbc5f5eda990ffed151d8