Merge "[automerger skipped] Merge "Don't notify of changes to non-VFS state...
Merge "[automerger skipped] Merge "Don't notify of changes to non-VFS state for inactive devices" into rvc-dev am: b6c210ac -s ours am: cc30117d -s ours" into rvc-d1-dev-plus-aosp