Merge "add /data/misc/profman for output am: 0eb24e1bc7 am: b829f909f7" into nyc-mr1-dev-plus-aosp
am: 9953fbdca6

* commit '9953fbdca62932c24ec8401137b5a029d72cd69f':

Change-Id: I14794009875531d71c9fb65d35edc92a6eeb928f