[automerger skipped] Merge "CSI to use framework's fallback home activity" am: 59ccd32b44 am: 3aeb02aa4b -s ours

am skip reason: Change-Id I87ee8e4b8238b348145ad507e0ef347198f56eab with SHA-1 d27f9dd2f8 is in history

Change-Id: I88bd9fca5c670f2a9be8f450173b36b0e98cd688