Merge "Add the instructions to resolve ABI difference" am: 7487a0a121 am: d82440d841

Original change: https://android-review.googlesource.com/c/platform/development/+/2262922

Change-Id: I0dca13962e92cec3ce9c648012cadb73fdd36926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>