Merge SPL-2019-12-05

Change-Id: I1b2c28f8e1b592b9f929ac7a50d1947656f704c9
tree: 0f833b19f50b2b7d8c4b633ae3e613fe8a06037c
  1. test/
  2. Android.bp
  3. time_in_state.c