Merge "Add test for inotify when legacy path is monitored" am: cd4ca1231e am: bcce1c23b5 am: e573ca52f3 am: dd1aca6be6

Original change: https://android-review.googlesource.com/c/platform/cts/+/1480556

Change-Id: I64374f127711ec6b4e4918f4c72fcc5e514728c4