Merge "Add java.time packages to whitelist."
am: 4dbe67cddc

Change-Id: I93342090e16090e73dd2377f027deedd321849d8