Merge QP1A.190523.001

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