Merge "Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: 7399079b5b" into nyc-mr1-dev-plus-aosp
am: f53e945c5c

* commit 'f53e945c5c33b110cff539b9d4ae6c59567b789d':

Change-Id: I09dd248ff1b5216c49f92df6a5cae5e8efb91c50