Merge "Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: bbcf18dbfd" into nyc-mr1-dev-plus-aosp
am: 6252410588

* commit '62524105885ba05e320d4880ce42a44f12323e96':

Change-Id: I25247605e47b4f9ee60db5fc3b8108e89a2478c5