[automerger skipped] Merge "Add test for getDeprecationTime and...
[automerger skipped] Merge "Add test for getDeprecationTime and getExpirationTime" into rvc-dev am: 95d81dfe am: 792debcc -s ours
am skip reason: Change-Id I64cd2c914f2da71383af7cdef2cf64c60a7d268c with SHA-1 f7c98aae is in history
Change-Id: I3a6d982e29700b478ae507083a40e08a42f26f22