Android 7.1.2 Release 28 (N2G48C)
Fixed the timestamp mismatching issue for 2 GTS cases.
am: 9696c226d8

Change-Id: I2825ad8ecfbbd0c874614d7f9668a39bb55a8b08