Merge changes from topic "bionic_fdsan_java" am: bb352287c9 am: 1fad55e868
am: f28713990b

Change-Id: I2f55eca5d6d2301905f37200f083949972170e40