Merge changes from topic "bionic_fdsan_java"
am: bb352287c9

Change-Id: Ib6c5ac9ffc7f9aa88749af1c0d66880a1c98a650