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

Change-Id: Ib738528a64b2fa957c437df50104e6b636287986