Merge "bootstat.rc: record post_decrypt_time_elapsed only for FDE device" am: 936738b8f7
am: e6ceb5a5b9

Change-Id: Ia993abb2aa0fe2c7eae248d195d2e263677955c2