Promotion of android_ui.lnx.2.1-00088.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2003882   I64e5ffdf021b95d5ac89b1455455d765bc9f30b1   Fix TimeLine picture and video number show wrong
2023569   I3fdf811c3a6ccc2d95cff3a4a84569a55a274a42   Fix NPE of getBluetoothClass() in SpeakerHooker

Change-Id: I4557680b52388af6f3968797523519bd2bf27fae
CRs-Fixed: 2023569, 2003882