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

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

Change-Id: If30aa79cfa99800596749c542a909a137541630d