DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: If62600a83118c079b499289f6e8cb4cc9cdb10f1
tree: c5dbe7518f9c8b0e72293c592dfc29cddea2ee51
  1. test/
  2. Android.bp
  3. time_in_state.c