Merge "Add hidden intent extra about service availability" into nyc-mr1-dev
am: 0bb29a8981

Change-Id: Ieb5ea74056211d6bba4bd4deee7773d476659df3