Merge "Update baseline for SamShouldBeLast check" am: bc83a3f1e2 am: dc5099acaa am: c40357cb03

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583673

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