Merge "Fix regression in adding recents input consumer leading to ANR" into rvc-dev am: c4ea03559a am: 7dc6fdd231 am: 241085b794

Change-Id: I5cae79d15d0e95984497b2ccaefde0599e42d8ac