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

Change-Id: I23613868a74b7b1dbd09a3325578c06b391780b5