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

Change-Id: I5a15effc199c7eb992c075f177da9eba5f299e93