Merge "Fix handling usb notification after pr_swap complete" am: b681fec035 am: d68e9ab715 am: 2ac83c4e47

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

Change-Id: Ic6901932eaa7d410700be980dc37ae37621d24e6