Merge "Merge "Frameworks/base: Make profile buffer adjustable" into nyc-dev am: a2723ca88c am: 9d3022c704" into nyc-mr1-dev-plus-aosp